From: Florian Müllner <fmuellner@gnome.org>
Date: Fri, 10 Aug 2018 11:43:59 +0000 (+0200)
Subject: build: Clean up tools' dependencies
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~929^2~3^2~12
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=9cf571efbd650b456054c249ab7c4218c304d3c9;p=gnome-shell.git

build: Clean up tools' dependencies

Simply reusing the same dependencies as gnome-shell itself not only
means that we link tons of stuff unnecessarily, but also that we
have to do the whole mutter rpath dance for nothing. Just use the
dependencies those executables actually need for a nice cleanup.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/192
---

diff --git a/src/meson.build b/src/meson.build
index 2670f589c..8cd7fe8cf 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -59,6 +59,9 @@ gnome_shell_deps = [
 gnome_shell_deps += nm_deps
 gnome_shell_deps += recorder_deps
 
+tools_cflags = '-DLOCALEDIR="@0@"'.format(localedir)
+tools_deps = [gio_dep, gjs_dep]
+
 libshell_menu_gir_sources = [
   'gtkactionmuxer.h',
   'gtkactionmuxer.c',
@@ -259,11 +262,9 @@ executable('gnome-shell', 'main.c',
 
 executable('gnome-shell-extension-prefs',
   'gnome-shell-extension-prefs.c', js_resources,
-  c_args: gnome_shell_cflags,
-  dependencies: gnome_shell_deps,
+  c_args: tools_cflags,
+  dependencies: tools_deps,
   include_directories: [conf_inc],
-  build_rpath: mutter_typelibdir,
-  install_rpath: install_rpath,
   install: true
 )
 
@@ -271,11 +272,9 @@ executable('gnome-shell-extension-prefs',
 if have_networkmanager
   executable('gnome-shell-portal-helper',
     'gnome-shell-portal-helper.c', js_resources,
-    c_args: gnome_shell_cflags,
-    dependencies: gnome_shell_deps,
+    c_args: tools_cflags,
+    dependencies: tools_deps,
     include_directories: [conf_inc],
-    build_rpath: mutter_typelibdir,
-    install_rpath: install_rpath,
     install_dir: libexecdir,
     install: true
   )
@@ -284,8 +283,6 @@ endif
 executable('gnome-shell-perf-helper', 'shell-perf-helper.c',
   dependencies: [gtk_dep, gio_dep, m_dep],
   include_directories: [conf_inc],
-  build_rpath: mutter_typelibdir,
-  install_rpath: install_rpath,
   install_dir: libexecdir,
   install: true
 )